mend one's fences